Switch from Bluepy to Bleak #4

Kevinlzh9802 · 2025-01-27T15:33:39Z

No description provided.

write rx with UUID add badge_bleak add badge_bleak add badge_bleak add badge_bleak add badge_bleak add badge_bleak rewrite utilities using bleak add request handler decorators add request handler decorators add request handler decorators add request handler decorators add request handler decorators rewrite utilities using bleak add request handler decorators

# Conflicts: # BadgeFramework/badge.py # BadgeFramework/bleak_test.py

Era-Dorta · 2025-01-27T15:48:06Z

BadgeFramework/badge_gui_bleak.py

@@ -0,0 +1,363 @@
+import tkinter as tk


@Era-Dorta remove this file and make badge_gui use from badge import OpenBadge

Review this file and remove the original gui file

Era-Dorta · 2025-01-27T15:57:59Z

BadgeFramework/test.py

                print(" mic gain:         FAIL            ")               
        else:
-			print(" mic mode:         FAIL             ")
+            print(" mic mode:         FAIL             ")


Needs to be updated to bleak

Era-Dorta

Reviewing the GUI file

Era-Dorta · 2025-03-04T14:19:42Z

BadgeFramework/badge_gui_bleak.py

+import pandas as pd
+from badge import OpenBadge
+from datetime import datetime
+# import numpy as np


Remove unused import

Suggested change

# import numpy as np

Era-Dorta · 2025-03-04T14:19:50Z

BadgeFramework/badge_gui_bleak.py

+import sys
+import time
+import ntplib
+# from functools import partial


Remove unused import

Suggested change

# from functools import partial

Era-Dorta · 2025-03-04T14:20:10Z

BadgeFramework/badge_gui_bleak.py

+# import numpy as np
+import sys
+import time
+import ntplib


Remove ntplib

Suggested change

import ntplib

Era-Dorta · 2025-03-04T14:20:45Z

BadgeFramework/badge_gui_bleak.py

+# def get_ntp_time(ntp_server='pool.ntp.org'):
+#     # Create an NTP client
+#     client = ntplib.NTPClient()
+#
+#     try:
+#         # Query the NTP server
+#         response = client.request(ntp_server)
+#
+#         # Convert the response to datetime
+#         ntp_time = datetime.fromtimestamp(response.tx_time, tz=timezone.utc)
+#         print("NTP time:", ntp_time.strftime('%Y-%m-%d %H:%M:%S %Z'))
+#         return ntp_time
+#
+#     except Exception as e:
+#         print("Could not connect to NTP server:", e)
+#         return None
+
+
+# Use a local NTP server (replace with your server IP if needed)
+# ntp_server_ip = '192.168.1.100'  # Example IP for a local NTP server
+# ntp_time = get_ntp_time(ntp_server=ntp_server_ip)


Remove commented out code

Suggested change

# def get_ntp_time(ntp_server='pool.ntp.org'):

# # Create an NTP client

# client = ntplib.NTPClient()

#

# try:

# # Query the NTP server

# response = client.request(ntp_server)

#

# # Convert the response to datetime

# ntp_time = datetime.fromtimestamp(response.tx_time, tz=timezone.utc)

# print("NTP time:", ntp_time.strftime('%Y-%m-%d %H:%M:%S %Z'))

# return ntp_time

#

# except Exception as e:

# print("Could not connect to NTP server:", e)

# return None

# Use a local NTP server (replace with your server IP if needed)

# ntp_server_ip = '192.168.1.100' # Example IP for a local NTP server

# ntp_time = get_ntp_time(ntp_server=ntp_server_ip)

Era-Dorta · 2025-03-04T14:20:58Z

BadgeFramework/badge_gui_bleak.py

+                return_message = await sensor_operation(t=datetime.now().timestamp())
+            else:
+                return_message = await sensor_operation()
+            # print(return_message)


Suggested change

# print(return_message)

Era-Dorta · 2025-03-04T14:30:17Z

BadgeFramework/badge_gui_bleak.py

+
+        self.title("Badge Status Monitor")
+        self.badges = pd.read_csv('mappings2.csv')
+        # self.badges = []


Please remove all commented out code

Era-Dorta · 2025-03-04T14:31:01Z

BadgeFramework/badge_gui_bleak.py

+        self.scrollbar.grid(row=0, column=0, sticky="ns")
+        self.canvas.grid(row=0, column=1, sticky="nsew")
+
+        # Bind mouse scroll to canvas


Please remove all comments that do not add anything to the code, as this one, which says the say as the function name

Era-Dorta · 2025-03-04T14:31:19Z

BadgeFramework/badge_gui_bleak.py

+            self.timestamp_labels[badge] = (timestamp_label, elapsed_time_label)
+            self.sensor_lights[badge] = sensor_light_canvases
+
+    def bind_mouse_scroll(self, widget):


Can you add type hints to all the functions?

Era-Dorta · 2025-03-04T14:47:56Z

BadgeFramework/badge_gui_bleak.py

+
+    def get_badge_address(self, badge_id: int) -> str:
+        badge = self.badges[self.badges['Participant Id'] == badge_id]
+        address = badge['Mac Address'].to_numpy()[0]  # There should be a more elegant way to do this


How about?

Suggested change

address = badge['Mac Address'].to_numpy()[0] # There should be a more elegant way to do this

address = badge['Mac Address'].values[0]

Era-Dorta

Additional review

Era-Dorta · 2025-03-04T14:48:51Z

BadgeFramework/badge_gui_bleak.py

+SENSOR_ALL = 0
+SENSOR_MICROPHONE = 1
+SENSOR_IMU = 2
+SENSOR_SCAN = 3
+SENSOR_CHECK_STATUS = 100
+SENSOR_TIMEOUT = 15
+
+SENSOR_START = True
+SENSOR_STOP = False
+CHECK_SYNC = True
+CHECK_NO_SYNC = False
+
+BADGES_ALL = -1000


Explain all of these constants?

It's just like the response_tags in badge_protocol to increase readability when passing the parameters.

Era-Dorta · 2025-03-04T14:49:10Z

BadgeFramework/badge_gui_bleak.py

+        sync_button.grid(row=0, column=10, padx=5, pady=5)
+
+        # Create rows for each badge
+        badges_list = list(range(1, len(self.badges) + 5))


This makes no sense, why make the list longer by 5?

Era-Dorta · 2025-03-04T15:05:01Z

BadgeFramework/badge_protocol.py

 Response_free_sdc_space_response_tag = 5
-Response_sdc_errase_all_response_tag = 32
-Response_get_imu_data_response_tag = 34
+


I don't know what happened with this file but I think all the changes should be removed

Era-Dorta · 2025-03-04T15:19:48Z

led/led.c

-		nrf_delay_ms(100);
+		nrf_delay_ms(1000);
 		nrf_gpio_pin_write(LED, LED_OFF);  //turn off LED
-		nrf_delay_ms(100);
+		nrf_delay_ms(1000);


Remember to also revert this changes

…ge.py and badge_protocol.py, test.py

Kevinlzh9802 and others added 24 commits July 5, 2024 14:25

test bleak

65e6c10

modify according to new hardware codes

0436540

modify according to new hardware codes

8506c88

modify according to new hardware codes

857e35f

modify according to new hardware codes

1736ff8

modify according to new hardware codes

5f7f58a

modify according to new hardware codes

f4bfc68

develop GUI with bleak

786b884

Merge remote-tracking branch 'origin/midge_zh' into midge_zh

12e8a83

# Conflicts: # BadgeFramework/badge.py # BadgeFramework/bleak_test.py

develop GUI with bleak

803562d

test modification at home

1c1e136

read data in imu and audio for tech pilot 11/01

582bef7

Try to parse imu files and check timestamp

780f15f

Add some matlab scripts for better visualization

bf577bb

Add some matlab scripts for better visualization

8218d59

make plots better; check for block size 24 or 32; code optimization

266cdab

remove redundant files

c367e63

adjust windows path

cad6e29

save data matlab

24d1053

plot cross midge

15c56a4

multiple plots by sensor and midge

a554b3d

Merge branch 'master' into midge_zh

582f133

Remove matlab, bluepy, imu_parser_v0

2b31868

Kevinlzh9802 requested a review from Era-Dorta January 27, 2025 15:33

Delete bluepy_test

87250c7

Era-Dorta reviewed Jan 27, 2025

View reviewed changes

Delete badge_interface.py and bleak_test.py

6504d61

Era-Dorta requested changes Mar 4, 2025

View reviewed changes

Era-Dorta reviewed Mar 4, 2025

View reviewed changes

Era-Dorta requested changes Mar 4, 2025

View reviewed changes

Era-Dorta reviewed Mar 4, 2025

View reviewed changes

Zonghuan Li and others added 11 commits March 5, 2025 09:20

Modify bleak gui according to comments

ce60a9d

Modify bleak gui according to comments

8794622

Modify bleak gui according to comments

d05f4a5

test connection time

769d367

modify test codes

fd504a2

modify protocol

d45196e

modify protocol

f75ebf5

modify test

f77e539

modify test and protocol

8ac99dd

modify badge protocol and test

469309e

Pass most of test

c1635d4

Era-Dorta mentioned this pull request Mar 12, 2025

Add entry point reporting the firmware version #14

Closed

Josfemova added this to midge-code S1 2025 Mar 13, 2025

Josfemova assigned Kevinlzh9802 Mar 13, 2025

Josfemova added the enhancement New feature or request label Mar 13, 2025

Josfemova moved this to In Progress in midge-code S1 2025 Mar 13, 2025

Kevinlzh9802 added 11 commits March 14, 2025 16:12

Modify audio parser and check decode parameters

58fac3c

Modify audio parser and check decode parameters, modify badge_protocol

ab1de26

modify badge protocol in vscode

02f1562

roll back audio_parser_V0.py, imu_parser_V0.py, hub_V1.py, modify bad…

4bc88e7

…ge.py and badge_protocol.py, test.py

modify test

47048f0

modify test

c056d9c

minimal modification of badge.py

e5b2a24

minimal changes in test.py

d732e7b

python 2to3 badge_gui

1c4d1cd

restore badge_interface

48e133d

partially fix old GUI

885f6d0

	address = badge['Mac Address'].to_numpy()[0] # There should be a more elegant way to do this
	address = badge['Mac Address'].values[0]

Switch from Bluepy to Bleak #4

Are you sure you want to change the base?

Switch from Bluepy to Bleak #4

Uh oh!

Conversation

Kevinlzh9802 commented Jan 27, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Era-Dorta left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Era-Dorta left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants